diff --git a/phpunit.xml b/phpunit.xml
index aca7809..2ae7ba3 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -22,4 +22,17 @@
 			
 		</testsuite>
 	</testsuites>
+	<filters>
+		<blacklist>
+			<directory suffix=".php">PEAR_INSTALL_DIR</directory>
+			<directory suffix=".php">PHP_LIBDIR</directory>
+			<directory suffix=".php">PROJECT_BASE.'tests'</directory>
+			<directory suffix=".php">'../system/core/CodeIgniter.php'</directory>
+		</blacklist>
+		<whitelist>
+			<!--
+			<directory suffix=".php">'../system/core'</directory>
+			-->
+		</whitelist>
+	</filters>
 </phpunit>
\ No newline at end of file
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 28c63f0..94dafdc 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -17,14 +17,4 @@
 require_once $dir.'/lib/common.php';
 require_once $dir.'/lib/ci_testcase.php';
 
-
-// Omit files in the PEAR & PHP Paths from ending up in the coverage report
-// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PEAR_INSTALL_DIR);	
-// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PHP_LIBDIR);	
-// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PROJECT_BASE.'tests');
-
-// Omit Tests from the coverage reports.
-// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToWhiteList('../system/core');
-// PHP_CodeCoverage_Filter::getInstance()->addFileToBlackList('../system/core/CodeIgniter.php');
-
 unset($dir);
\ No newline at end of file